Merge remote-tracking branch 'origin/master'

Conflicts:
	mnstr/views.py
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of /Users/axsauze/IdeaProjects/monsternews with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	mnstr/views.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	mnstr/views.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	mnstr/static/css/main.css
	mnstr/views.pyc
Merge remote-tracking branch 'origin/master'

Conflicts:
	mnstr/views.py