Created dashboard
Merge branch 'master' of github.com:InLieuOfFlowers/InLieuOfFlowers

Conflicts:
	app/controllers/main_controller.rb
	app/views/main/dashboard.html.erb
	config/routes.rb