last push most likely
Merge branch 'master' of github.com:dtourio/dtourio

* 'master' of github.com:dtourio/dtourio:
  last push most likely
last commit
Update rails to 3.2.11 to fix security issue
Fix merge conflicts
Merge branch 'master' of github.com:dtourio/dtourio

Conflicts:
	app/assets/stylesheets/home.css.scss
	app/views/home/index.html.erb