Merge branch 'master' of C:\Users\Christopher\Dropbox\Public\CS4240\CS4240Project with conflicts.
Still trying on Amazon Spider.