Trying to match PSR.
Merge branch 'master' of https://github.com/Codingbean/Macaw

Conflicts:
	macaw.php