Charlie's shit v1
Merge branch 'master' of http://github.com/keitase/EECS498-term-project