Adding local changes to repo
Merge branch 'dev' of http://github.com/whizkid338/online_journal

Conflicts:
	online_journal/settings.py
	static/css/style.css
	static/style.css
	templates/style.css
	templates/style.css.old

Merging live site changes with dev branch