checking in git ignore
removing .idea/* files
ignored some more files
Merge branch 'master' of github.com:pasviegas/jellybean
Revert "ignored some more files"

This reverts commit 54c1d2f1887f8cecca2f8d77e7d81d2be3f8a715.
checked in some crap
merged conflicts