Git being silly.

It is requiring me to upload these changes to download new changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CST420_Assignment03_try2/CST420_Assignment03_try2.sdf
	CST420_Assignment03_try2/CST420_Assignment03_try2.v12.suo
Merge remote-tracking branch 'origin/master'

Conflicts:
	CST420_Assignment03_try2/CST420_Assignment03_try2.sdf
	CST420_Assignment03_try2/CST420_Assignment03_try2.v12.suo