Added html
"committing"
Merge branch 'master' of https://github.com/axsauze/monsternews
Added html
Merge remote-tracking branch 'origin/master'

Conflicts:
	mnstr/views.py