cleanup
Merge branch 'master' of https://github.com/dtn1712/Frittie

Conflicts:
	frittie/db/frittie.db
	frittie/settings.py
	frittie/urls.py