Trying to get rid of .DS_Store.
Updated project after months of work for Senior Project
Merge remote-tracking branch 'origin/master' into randy

Making randy into the new master.
.DS_Store removed.