added django markdown to urls.py in mainpage. Perhaps it should be in blog instead
Continued on django_markdown setup stuff
Merge branch 'develop' of https://github.com/kakefabrikken/Summer-Hackaton into text_editor

Want updated stuff
Finished setting up django_markdown. Admin side blogpost-creation now makes use of the new editor instead of standard.
Added some features to models.blogpost
removed settings.py from .gitignore
Merge branch 'text_editor' into develop
Should have resolved all merge-conflicts