afternoon's work
Added all the files that's needed
Trying again
again
Merge branch '8-14-14_afternoon' of https://github.com/hfan36/recon into 8-14-14_afternoon

Conflicts:
	CT_Recon/mlem.cu