still trying to merge
Merge branch 'master' of https://github.com/cedophile/global-game-jam-2013
Merge branch 'master' of https://github.com/cedophile/global-game-jam-2013

Conflicts:
	main.lua
Merge branch 'master' of https://github.com/cedophile/global-game-jam-2013
counter upgraded
Merge branch 'master' of https://github.com/cedophile/global-game-jam-2013