Added 404 and error page
Merge pull request #48 from richardjh/master

Added 404 and error page
Merge pull request #49 from asgrim/adds-april-videos

Adds talks from April's meetup
Make the videos page more responsive
Merge pull request #51 from lboynton/responsive-videos

Make the videos page more responsive
Merge branch 'master' of https://github.com/richardjh/phph-site into richardjh-master

Conflicts:
	composer.lock
Tweaks to links and whatnot
Update index.phtml
Update 2014-05-14.php
Added June meetup
Update 2014-06-11.php
Update 2014-06-11.php
Update 2014-06-11.php
Update index.phtml
Create 2014-07-09.php
Update 2014-06-11.php
Update MeetupsService.php
Update MeetupsService.php
Update MeetupsService.php