git_ignore
Merge branch 'master' of https://github.com/tpham93/gj_game

Conflicts:
	.gitignore
	TimeFreeze/TimeFreeze.v11.suo