Working on on-screen objects from file
Group push/pull
Merge branch 'master' of https://github.com/Whirligig231/boilermake2014
Recommit for off-screen
Merge branch 'master' of https://github.com/Whirligig231/boilermake2014