messing with merging, some homework stuff is in here
Merge branch 'mergetest'
unmerge?
unmerge?2
pushing up dev_lt from our ftp
resolved conflicts from dev_lt to master
Merge branch 'carl'
created a new branch to merge carls stuff over to master
pushing up homework stuff
Revert "pushing up dev_lt from our ftp"

This reverts commit c0c71a060ab279a5beaf276a6063157246740d86.
Merge branch 'master' into homework