Map to GitHub
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Make Path Relative
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Refactor the Base App to be more modular