Setup angular routes, try them out on github.io
Merge remote-tracking branch 'refs/remotes/origin/gh-pages' into gh-pages

Conflicts:
	index.html