Merge pull request #43 from michaelmunson1/dbUser

Db user
now displaying timestamp in clippings view in an elegant form
fetchTokenizedClippings - in Python
Merge pull request #44 from michaelmunson1/elegantTimestamp

now displaying timestamp in clippings view in an elegant form
Merge branch 'master' of https://github.com/michaelmunson1/caracol
added meta tags to enable responsiveness
Merge pull request #45 from michaelmunson1/enablingResponsive

added meta tags to enable responsiveness
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