fuck off
asdflkjasdf
Merge branch 'master' of https://github.com/mattlafy/pion

Conflicts:
	app/views/News/list.blade.php