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

Conflicts:
	MERGING-UPSTREAM-CHANGES.md