Fixing static files with dev
Merge branch 'dev' of http://www.github.com/whizkid338/online_journal into dev

Conflicts:
	online_journal/settings.py

Merging new dev branch into existing local repo
Merge branch 'dev' of http://www.github.com/whizkid338/online_journal into dev
Changing settings and urls so static files work on development server