new homepage
asdfasdf
fix merge problem
asdfa
fixed homepage paths
asdfadf
Merge branch 'master' of github.com:mugu87/myApp
best of today so far
more REST
fix merge
Add causes
Merge branch 'ryan_test'
New Logo
css changes
Merge branch 'ryan_test'
fix merge
Merge branch 'master' of github.com:mugu87/myApp

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/layouts/application.html.erb
didn't do this.
added event