davg
Merge branch 'master' of https://github.com/Jveenstra1988/editall

Conflicts:
	css/style.css
	index.php
afg