fixing voting views
Merge branch 'master' of github.com:tcase360/restaurant2

Conflicts:
	public/views/voting/delete.html
	public/views/voting/new.html
	public/views/voting/voting.html
still trying to get views to work
Merge branch 'master' of github.com:tcase360/restaurant2

Conflicts:
	app/views/includes/foot.jade
	public/js/app.js
	public/js/config.js
changes to votes
Merge branch 'master' of github.com:tcase360/restaurant2

Conflicts:
	app/views/includes/foot.jade
	public/js/app.js
	public/js/config.js
test