extended commit
Merge branch 'master' of https://github.com/cassidoo/splash

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