Merge pull request #6 from ubertool/tom

Tom
Merge pull request #7 from ubertool/tom

third test
deleting icon
git ignore
Adding aptana project files to gitignore
deleting extraneous files and .gitignore changes
modifying .gitignore
Merge branch 'master' of https://github.com/ubertool/ubertool_src
playing
Merge branch 'tom' of https://github.com/puruckertom/ubertool_src into tom
delete keys