a loney loney!!
Merge branch 'master' of https://github.com/Jveenstra1988/editall2

Conflicts:
	css/style.css
	index.php