"Renamed Achievement controller"
Merge branch 'master' of https://github.com/diegopacheco/Hackathons
Added html to the controller
Merge branch 'master' of https://github.com/diegopacheco/Hackathons

Conflicts:
	warBook/conf/routes