merge changes
Merge branch 'master' of https://github.com/drunkel/mybudget

Conflicts:
	.gwt/.gwt-log
removed gitignore, was breaking GWT plugin