getting IDEA to work.
Merge branch 'master' of github.com:3daughterdad/ssu14cs355