Media and Guides try out
Merge branch 'master' of https://github.com/Tech-Grind/ng-techgrind

Conflicts:
	app/index.html
	app/js/controllers/res-media.js
	src/js/app.coffee
Merge branch 'master' of https://github.com/Tech-Grind/ng-techgrind
Media
media
Merge branch 'master' of https://github.com/Tech-Grind/ng-techgrind