converting a few things to html/js from jade/coffee
Merge branch 'master' of github.com:Tech-Grind/ng-techgrind

Conflicts:
	src/js/services.coffee