fix bookmarklet at top of window
Merge branch 'master' of https://github.com/michaelmunson1/caracol
add contoller/service for article rating
clean up extra /vote route
train some unruly syntax
Merge branch 'master' of https://github.com/michaelmunson1/caracol
Merge branch 'master' of https://github.com/michaelmunson1/caracol

Conflicts:
	public/views/main.html
clean up extra /vote route
train some unruly syntax
return iframe styling in html
save vote to db
clean up extra /vote route
train some unruly syntax
return iframe styling in html
save vote to db
add button functionality to inserted bookmarklet
style bookmarlet a la mr fox; toy with .travis.yml/gruntfile to get travis working
change to cloud app
Merge branch 'ngBook' of https://github.com/michaelmunson1/caracol into ngBook

Conflicts:
	client/controllers.js
	client/partials/home.html
	database/dbschemas.js
	server.js
Merge branch 'master' of https://github.com/michaelmunson1/caracol