first commit
added .idea to gitignore
added .idea to .gitignore
some added files
Merge branch 'master' of github.com:kledk/default-vagrant