Working on the newstory page
Merge branch 'master' into myWork

Conflicts:
	views/newstory.html

Merge