random files I all of a sudden got
main sync

Conflicts:
	main.lua
Merge branch 'master' of https://github.com/cedophile/global-game-jam-2013
trying to merge
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