test commit
second test
Merge pull request #6 from ubertool/tom

Tom
third test
Merge pull request #7 from ubertool/tom

third test
deleting icon
git ignore
Adding aptana project files to gitignore
test icon tao
modify gitignor
ignore .bak
ignore yaml
update ignore
git ignore
deleting many extraneous files
deleting extraneous files and .gitignore changes
modifying .gitignore
Merge branch 'master' of https://github.com/ubertool/ubertool_src
Create README.md
Merge remote-tracking branch 'origin/master' into tao

Conflicts:
	.gitignore