changes before pull
Merge branch 'master' of https://github.com/dpappa/lifesweeper.me

Conflicts:
	about.php
	css/presentation.css
	development.php
	includes/header.php
	sponsors.php
stuff