Removed some trash, validated
Merge branch 'master' of github.com:group3-cogs187a/187a_group2_final