removed buttons with a so links work
Merge branch 'master' of https://github.com/laanak08/GrabCoffeeWithMe

Conflicts:
	public/javascripts/main.js