first commit
Merge branch 'master' of https://github.com/OSU-CS494-F14/dovzhika-Student into rewriting-the-future