merge messed up
Merge branch 'carl'
created a new branch to merge carls stuff over to master
pushing up homework stuff