Merge branch 'gh-pages' of github.com:o3design/giv2giv-angularjs into gh-pages

Conflicts:
	dist/index.html
Fixing routing problem
Rebuilding
Merge branch 'yeoman' of github.com:o3design/giv2giv-angularjs into yeoman

Conflicts:
	dist/index.html