Update
Merge branch 'master' of https://github.com/wragen22/coastpainting

Conflicts:
	index.php