clean up
pull branch 'master' of https://github.com/mdittber/GroupProject
moved old omen version to OMEN folder