added recent changes
Merge branch 'master' of github.com:derekp89/cs3380