Commit to Pull

Not sure what I'm committing. Because I haven't made any changes. But I
need to commit in order to pull the latest.
Trying to Pull Still

The shell is telling me to commit my changes. So I guess I'm going to do
that. Hopefully this will let me pull.
Merge branch 'master' of https://github.com/ccyphers1/CrunchTime

Conflicts:
	ITintheDWebsite/ITintheDWebsite.v11.suo