Merge branch 'master' of https://github.com/mattzhao92/PacGene

Conflicts:
	Pacwar.xcodeproj/project.xcworkspace/xcuserdata/mattzhao.xcuserdatad/UserInterfaceState.xcuserstate
	fabfile.py
Merge branch 'master' of https://github.com/mattzhao92/PacGene

Conflicts:
	fabfile.py
	fabfile.pyc