Merge branch 'gh-pages'
Week 4 Commit

Week COde, Corected App Directories
Merge branch 'master' into gh-pages

Conflicts:
	Location.html
	Notifications.html