le tired coding
Merge branch 'master' of https://github.com/irony/Narmaste

Conflicts:
	public/javascripts/map.js
	public/stylesheets/style.css
	views/index.jade
super tired coding