Merge pull request #3 from sandstroh/sandrosbranch

added .idea folder
Merge pull request #4 from sandstroh/sandrosbranch

some changes
some .idea files still where there