Added documentation on merging upstream changes
Added documentation on merging upstream changes
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:myapnea/www.myapnea.org

Conflicts:
	MERGING-UPSTREAM-CHANGES.md
Merge remote-tracking branch 'upstream/master'
Getting styles
Integrating myapnea-theme to opn. Closed #10
Overwrote layout, navigation, and footer from openpprn to match MyApnea theme.

Closed #11
Refactored myapnea styles. Finished home page redesign - Closed #7.
Re-designed the Learn page. Closed myapnea/www_myapnea_org#4
Added first version of MyApnea sign up flow. Added consent form. Consolidated site functions into central user dashboard. Closed myapnea/www_myapnea_org#8. Closed myapnea/www_myapnea_org#9.
Updated Research Page. Updated Privacy Policy. Updated Share page. Closed myapnea/www_myapnea_org#2. Closed myapnea/www_myapnea_org#3
Merge pull request #12 from myapnea/R1.0

R1.0
Fixed styles and blog link
Fixed post sign-in path
Fixed some asset paths
Merged changes from upstream/R2.0
Use rails convention for development and test database names, and fixed an incorrect/duplicated migration
Ignore automatically generated files that cause merge conflicts
Updated travis builds for myapnea fork