i dont know
Merge branch 'master' of github.com:mike590/MetroGenie

Conflicts:
	public/views/index.erb