add login buttons to main page; begin to setup angular
now even more login awesomeness
change to cloudapp
add login buttons to main page; begin to setup angular
now even more login awesomeness
change to cloudapp
setup localstorage auth, and query db based on bookmarked sites
Merge branch 'dbUser' of https://github.com/michaelmunson1/caracol into dbUser

Conflicts:
	public/scripts/app.js
	public/scripts/controllers/auth.js
	public/scripts/services/auth.js
	public/views/main.html
	server.js
add login buttons to main page; begin to setup angular
now even more login awesomeness
change to cloudapp
add login buttons to main page; begin to setup angular
now even more login awesomeness
change to cloudapp
setup localstorage auth, and query db based on bookmarked sites
write to user_id, clipping_id, vote to user_clippings table
to cloud app
Merge branch 'dbUser' of https://github.com/michaelmunson1/caracol into dbUser

Conflicts:
	client/app.js
	client/controllers.js
	client/partials/home.html
	database/dbclient.js
	public/views/main.html
	server.js
address comments on pull request
add semicolon