act buttons
Merge branch 'master' of https://github.com/connor4312/startup-weekend

Conflicts:
	public/css/style.css