fix grammar in views for issue 239

.gitignore

@@ -32,3 +32,4 @@ vendor/bundle
 vendor/cache
 logfile
 .env
+.DS_Store

app/views/index/index.html.erb

@@ -1,7 +1,7 @@
 <div class="leftside">
 	<h1>Welcome to <em>openSNP</em></h1>
 		<p><%=image_tag "microarray.png",:style => "float:left;margin: 10px"%></p>
-        <p><h7><em>openSNP</em> allows customers of direct-to-customer genetic tests to publish their test results, find others with similar genetic variations, learn more about their results by getting the latest primary literature on their variations, and help scientists find new associations.</h7></p> <center><a href="/signup" class="btn btn-primary btn-large">Sign Up!</a>  <a href="/data/zip/opensnp_datadump.current.zip" class="btn btn-primary btn-large">Download the data!</a></center><br/><br/>
+        <p><h7><em>openSNP</em> lets customers of direct-to-customer genetic tests publish their test results, find others with similar genetic variations, learn more about their results by getting the latest primary literature on their variations, and helps scientists find new associations.</h7></p> <center><a href="/signup" class="btn btn-primary btn-large">Sign Up!</a>  <a href="/data/zip/opensnp_datadump.current.zip" class="btn btn-primary btn-large">Download the data!</a></center><br/><br/>
 		<div id="tab-container"> 
 			<ul class="nav nav-tabs"> 
 				<li><a href="#dtcustomers">For Genotyping Users</a></li> 
@@ -19,7 +19,7 @@
 					<h4>Share Your Phenotypes & Traits</h4> 
 					<%=image_tag("phenotypes.png")%><br/>
                     Phenotypes are the observable characteristics of your body, such as height, eye color or preference for coffee.
-					Share your phenotype with other <em>openSNP</em> users and find others with similar characteristics and traits.<br/>Your data may help scientists discover new genetic associations!
+					Share your phenotype with other <em>openSNP</em> users, and find others with similar characteristics and traits.<br/>Your data may help scientists discover new genetic associations!
 					</div>
 					<div class="well span3">
 					<h4>Share your stories on variations & phenotypes</h4>
@@ -29,7 +29,7 @@
 					<div class="well span3">
 					<h4>Find literature on genetic variation</h4>
 					<%=image_tag("literature.png")%></br>
-					<em>openSNP</em> gets the latest open access journal articles on genetic variations from the <em><%=link_to "Public Library of Science","http://www.plos.org/"%></em>. Popular articles are indexed via the social reference manager <em><%=link_to "Mendeley","http://www.mendeley.com/"%></em> and summaries are provided by <em><%=link_to "SNPedia","http://snpedia.com"%></em>.
+					<em>openSNP</em> gets the latest open access journal articles on genetic variations from the <em><%=link_to "Public Library of Science","http://www.plos.org/"%></em>. Popular articles are indexed via the social reference manager <em><%=link_to "Mendeley","http://www.mendeley.com/"%></em>, and summaries are provided by <em><%=link_to "SNPedia","http://snpedia.com"%></em>.
 					</div>
 			</div>
 			</div>
@@ -40,17 +40,17 @@
 				<div class="well span4">
 					<h4>Search for phenotypes</h4>
 					<%=image_tag("phenotypesearch.png")%><br/>
-					Many diseases and traits are suspected to have genetical components. Genome Wide Association Studies are a simple tool find genetic markers. Easily find people with the variation you are interested in via openSNP.<br/><br/>The variation you are looking for is not entered yet? Just add it to <em>openSNP</em> 
+					Many diseases and traits are suspected to have genetical components. Genome Wide Association Studies are a simple tool for finding genetic markers. Easily find people with the variation you are interested in via <em>openSNP</em>.<br/><br/>Is the variation for which you're looking not entered yet? Just add it to <em>openSNP</em>.
 					</div>
 					<div class="well span4">
 					<h4>Easily download datasets</h4>
 					<%=image_tag("filedownload.png")%><br/>
-                    The mass download-function of <em>openSNP</em> allows you to easily download the full genotyping raw-data in the file formats that are provided by <em>23andMe</em>, <em>deCODEme</em> and <em>FamilyTreeDNA</em>.<br/><br/>As the files can be grouped by their variations for specific phenotypes it is easy to get datasets that are already usable for association studies. 
+                    The mass-download function of <em>openSNP</em> allows you to easily download full genotyping raw-data in the file formats that are provided by <em>23andMe</em>, <em>deCODEme</em> and <em>FamilyTreeDNA</em>.<br/><br/>As the files can be grouped by their variations for specific phenotypes, it's easy to get datasets that are already usable for association studies. 
 					</div>
 					<div class="well span4">
 					<h4>Get notified about new data</h4>
 					<%=image_tag("rss.png")%><br/>
-					<em>openSNP</em> delivers a RSS-feed for each phenotype. So you can easily get all new datasets that get available for the phenotypes of your interest, without the need to check for new entries by hand.<br/><br/>For all data junkies that need more data: There is also a feed that carries all new datasets. 
+					<em>openSNP</em> delivers an RSS-feed for each phenotype. So you can easily get all new datasets that get available for the phenotypes of your interest, without the need to check for new entries by hand.<br/><br/>For data-junkies that need more data: there's also a feed that carries all new datasets. 
 					</div>
 					</div>
 					</div>

app/views/layouts/_footer.html.erb

@@ -2,7 +2,7 @@
     <div class="container">
     Contact openSNP: <a href="http://opensnp.wordpress.com" target="_blank">Blog</a> | <a href="http://www.twitter.com/openSNPorg" target="_blank">Twitter</a> | <a href="mailto:info@opensnp.org">Mail</a> | 	<a href="https://www.iubenda.com/privacy-policy/641811" class="iubenda-nostyle " id="iubenda-embed" title="Privacy Policy">Privacy Policy</a> | <%= link_to "openSNP in the press", "/press"%>
     <br/><br/>
-    Our hosting is made possible thanks to the kind support of <a href="https://www.sbgenomics.com/">Seven Bridges</a> – and its biomedical data analysis platform – and <a href="https://patreon.com/openSNP">our patrons on Patreon.</a> Please consider <a href="https://www.patreon.com/openSNP?ty=h">supporting us as well</a>, if our service is valuable to you!
+    Our hosting is made possible thanks to the kind support of <a href="https://www.sbgenomics.com/">Seven Bridges</a> – and its biomedical data analysis platform – and <a href="https://patreon.com/openSNP">our patrons on Patreon.</a> Please consider <a href="https://www.patreon.com/openSNP?ty=h">supporting us as well</a> if our service is valuable to you!
     <script type="text/javascript">(function (w,d) {var loader = function () {var s = d.createElement("script"), tag = d.getElementsByTagName("script")[0]; s.src = "https://cdn.iubenda.com/iubenda.js"; tag.parentNode.insertBefore(s,tag);}; w.addEventListener ? w.addEventListener("load", loader, false) : w.attachEvent("onload", loader);})(window, document);</script></br></br>
-        The openSNP project is licensed under the <a href="https://github.com/openSNP/snpr/blob/master/LICENSE.md" target="_blank">MIT License</a>, the code <a href="https://github.com/openSNP/snpr">is at GitHub</a>. The data is donated into the public domain using <a href="http://creativecommons.org/publicdomain/zero/1.0/" target="_blank">CC0 1.0</a>. The hand drawn icons were created by <a href="http://oneseventyseven.com/" target="_blank">one seventy seven</a> and are licensed under <a href="http://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>, the CSS of openSNP is provided by <a href="http://twitter.github.com/bootstrap/">Bootstrap, from Twitter</a> and is licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v2.0</a>. Tiny white person in the navigational-bar from <a href="http://glyphicons.com/">glyphicons</a>.
+        The openSNP project is licensed under the <a href="https://github.com/openSNP/snpr/blob/master/LICENSE.md" target="_blank">MIT License</a>, and the code <a href="https://github.com/openSNP/snpr">is on GitHub</a>. The data is donated into the public domain using <a href="http://creativecommons.org/publicdomain/zero/1.0/" target="_blank">CC0 1.0</a>. The hand-drawn icons were created by <a href="http://oneseventyseven.com/" target="_blank">one seventy seven</a> and are licensed under <a href="http://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>. The CSS of openSNP is provided by <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap</a> and is licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v2.0</a>. The tiny white person in the navigation-bar is from <a href="http://glyphicons.com/">glyphicons</a>.
     </div>

app/views/news/index.html.erb

@@ -42,7 +42,7 @@
     </div>
     <h5> 2016-03-17: We're joining the Google Summer of Code</h5>
     <p>
-      Each year Google is running its Google Summer of Code (GSoC), which is aimed at students to get started with open source work. Students participating in it will get paid by Google to work on a specific open source project for 3 months.
+      Each year, Google runs its Google Summer of Code (GSoC) program, which is aimed at students interested in open-source work. Participating students will get paid by Google to work on a specific open-source project for 3 months.
     </p>
     <p>
       The Open Bioinformatics Foundation (OBF) has put up a few of our project ideas, so if you're a currently enrolled student and you want to <a href="http://obf.github.io/GSoC/ideas/#opensnp">work on improving openSNP while earning money, our proposed projects are listed online</a>.
@@ -54,11 +54,11 @@
       Some more general information can <a href="http://obf.github.io/GSoC/">be found on the OBF's GSoC pages</a>.
     </p>
     <p>
-      The application deadline for this year's Google Summer of Code (GSoC) is approaching fast (March 25th). So If you're interested in participating in this program, just reply to this newsletter or <a href="https://gitter.im/openSNP/snpr">join us on gitter</a>.
+      The application deadline for this year's Google Summer of Code (GSoC) is approaching quickly (March 25th). So if you're interested in participating in this program, just reply to this newsletter or <a href="https://gitter.im/openSNP/snpr">join us on gitter</a>.
     </p>
     <h5> 2016-02-05: Adopting a Code of Conduct</h5>
     <p>
-    We strive to keep openSNP a friendly community, amongst our developers as well as the community on openSNP.org. So far this hasn't been a problem and we don't expect it to become one. Thanks for being model open science citizens to everyone in the openSNP universe. In order to show our commitment to diversity, inclusion and creating safe spaces <a href="https://github.com/gedankenstuecke/snpr/blob/master/CODE_OF_CONDUCT.md">we are adopting a Code of Conduct</a>, inspired by the team of <a href="http://www.slidewinder.io">Slidewinder.io</a>.
+    We strive to keep openSNP a friendly community, amongst our developers as well as the community on openSNP.org. So far this hasn't been a problem, and we don't expect it to become one. Thanks for being model open science citizens to everyone in the openSNP universe. In order to show our commitment to diversity, inclusion and creating safe spaces <a href="https://github.com/gedankenstuecke/snpr/blob/master/CODE_OF_CONDUCT.md">we are adopting a Code of Conduct</a>, inspired by the team of <a href="http://www.slidewinder.io">Slidewinder.io</a>.
     </p>
     <h5> 2015-09-23: openSNP is now on Patreon </h5>
     <p>
@@ -71,12 +71,12 @@
     <h5>3 years of openSNP and 1000 genotypings!</h5>
     <p>openSNP has now been running for 3 years and we recently received the 1000th genotyping. Thanks to all users and helpers who made this possible! <a href='http://opensnp.wordpress.com/2014/05/31/1000-genotypings-and-3-years-of-opensnp/'>More on the blog</a>.<p>
     <h5>Support the Open Access petition of access2research</h5>
-    <p>We support the <a href="http://wh.gov/6TH">access2research petition for Open Access</a> directed to the Obama administration. The petition wants to make Open Access publication of tax-funded publications mandatory. In total, 25,000 signatures are needed to have the petition officially reviewed by the White House. Non-US-citizens may sign the petition, too, so <a href="http://wh.gov/6TH">it would be great if you sign it</a>, too! For more information, please <a href="http://opensnp.wordpress.com/2012/05/23/a-petition-on-open-access/">read our blogpost on the petition</a>.
+    <p>We support the <a href="http://wh.gov/6TH">access2research petition for Open Access</a> directed to the Obama administration. The petition seeks to make Open Access publication of tax-funded publications mandatory. In total, 25,000 signatures are needed to have the petition officially reviewed by the White House. Non-US-citizens may sign the petition, too, so <a href="http://wh.gov/6TH">it would be great if you sign it</a>, too! For more information, please <a href="http://opensnp.wordpress.com/2012/05/23/a-petition-on-open-access/">read our blogpost on the petition</a>.
     <div align="center"><%= image_tag("a2r.png") %></div>
     </p>
     <h5>API: JSON methods</h5>
     <p>
-    The promised support for the <em>Distributed Annotation System</em> will take some time. But in the meantime you can access <em>openSNP</em> using some simple JSON-methods. Examples can be found for <a href="http://opensnp.org/snps/json/rs9939609/1.json">SNPs</a>, <a href="http://opensnp.org/users.json">users</a> and <a href="http://opensnp.org/phenotypes/json/1,6,8.json">phenotypes</a>. To learn more about how to use those methods you may want to <a href="http://opensnp.org/faq#api">read the FAQ</a> or this blogpost we've written about this.
+    The promised support for the <em>Distributed Annotation System</em> will take some time. But in the meantime, you can access <em>openSNP</em> using some simple JSON-methods. Examples can be found for <a href="http://opensnp.org/snps/json/rs9939609/1.json">SNPs</a>, <a href="http://opensnp.org/users.json">users</a>, and <a href="http://opensnp.org/phenotypes/json/1,6,8.json">phenotypes</a>. To learn more about how to use those methods you may want to <a href="http://opensnp.org/faq#api">read the FAQ</a> or this blogpost we've written about this.
     </p>
     <h5>SSL-Support</h5>
     <p>

app/views/password_resets/new.html.erb

@@ -1,6 +1,6 @@
 <h1>Forgot Password</h1>
 
-Fill out the form below and instructions to reset your password will be emailed to you:<br />
+Fill out the form below, and instructions to reset your password will be emailed to you:<br />
 <br />
 
 <%= form_tag password_resets_path do %>