ignoring .idea
sorting requirements
added south to apps
removing south from master settings
small changes to settings
Merge branch 'dev'
new db settings for dev
Merge branch 'dev'
prod database settings for master
specifying port
Merge branch 'dev'

Conflicts:
	tinyed/settings.py
created fixtures
Merge branch 'dev'