commit
Merge branch 'master' of https://github.com/nyabb/poc

Conflicts:
	app/views/dashboard/index.html.erb