changed a ton o' stuff.
Merge branch 'master' of http://github.com/afloren/NEU385L-project