Merge branch 'rails' of https://github.com/tylerm214/greener into rails

Conflicts:
	greener/app/views/developers/index.html.erb
...
Merge branch 'rails' of https://github.com/tylerm214/greener into rails