angular setup
Merge branch 'gh-pages' of https://github.com/aaron-spear/style-guide into gh-pages

Conflicts:
	index-old.html
	index.html