Merge branch 'master' of https://github.com/wwwdotphilip/Corona-Code-Gists

Conflicts:
	positionObject.lua