send image
Merge branch 'master' of https://github.com/patrickreynolds/bueller

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