full energy super design
Merge branch 'master' of https://github.com/irony/Narmaste

Conflicts:
	public/javascripts/compass.js
	public/javascripts/map.js
	public/stylesheets/style.css
	routes/index.js
	views/index.jade