Merge pull request #1 from arkeidolon/master

Add cuteness
Add .idea to git ignore
Include top level .idea in gitignore
Merge pull request #3 from arkeidolon/master

Add .idea to git ignore
Merge master to dev
Merge pull request #4 from arkeidolon/dev

Merge master to dev