modified .gitignore
Delete ct_recon-5a99f219.ipch
changed .gitignore
stupid ipch
Merge branch 'master' of https://github.com/hfan36/recon
Merge branch '8-15-2014'

Conflicts:
	.gitignore
Merge branch '8-18-2014'
Merge https://github.com/hfan36/recon into 8-18-2014