nothing
Merge branch 'master' of ssh://git@github.com/avivkiss/WHIP_Scaffold.git

Conflicts:
	WineHipster/src/com/example/winehipster/Entry.java