synchro
Merge branch 'master' of https://github.com/gurbano/personal

Conflicts:
	app.js
	public/css/bootstrap-responsive.min.css
	routes/index.js