ground times
Merge branch 'master' of https://github.com/alicornea/TestAngularJS

Conflicts:
	js/main.js