more
Merge branch 'master' of https://github.com/adpio/bitnotes

Conflicts:
	models.pyc
	views.pyc
gitignore