3 votes per day per user
Merge branch 'master' of https://github.com/lauracarvajal/Stand-Up-Tunes

Conflicts:
	public/index.html
	public/styles/style.css