oauth2
Merge branch 'master' of https://github.com/ndhoule/dott

Conflicts:
	app/public/stylesheets/styles.css
Merge pull request #6 from magicgrl111/master

Oauth