COMMIT 42
Merge branch 'master' of https://github.com/jasonvitagen/ann

Conflicts:
	public/stylesheets/style.css
	views/article/view.ejs