Adding first version
Merge branch 'master' of https://github.com/sunblok/CS313
First one