finish main stuff
Merge branch 'master' of http://github.com/JakubBerlinski/cs381
finished main