needed to add output files to tracking list so i could pull form main repo
Merge branch 'master' of https://github.com/2014SeniorProject/FPGAcontrol

Conflicts:
	output_files/I2C_MyNano.done
	output_files/I2C_MyNano.fit.smsg
	output_files/I2C_MyNano.jdi
	output_files/I2C_MyNano.map.smsg
	output_files/I2C_MyNano.pin
	output_files/I2C_MyNano.pof
	output_files/I2C_MyNano.sof