Merge pull request #3 from collegeteamAS/working

Working
Merge branch 'working' of https://github.com/collegeteamAS/comp-projects into working

important
what
test
what
flushing