using angularjs
Merge branch 'HEAD' of https://github.com/adrianojlt/adrianojlt.github.com.git

Conflicts:
	assets/css/app.css
	assets/js/app.js
	partials/home.htm