sip don't use this one.
Merge branch 'master' of https://github.com/lhp81/note-tagger into server_and_deploy
Merge branch 'server_and_deploy'

Conflicts:
	fabfile.py