commit gitignore
gitignore
Merge branch 'master' into assignment4
a
gitignore
gitignore
Merge branch 'master' into assignment4
Merge branch 'master' into assignment4
Deletes binaries.
Adds model.
Merge branch 'master' of https://github.com/nikeller/webt_onlineshop

Conflicts:
	.gitignore
	app/controllers/Application.java
	app/models/Anmeldung.java
	app/models/Torten.java
	app/views/Kasse.scala.html
	app/views/Kategorie_Gebaeck.scala.html
	app/views/Kategorie_Torten.scala.html
	app/views/SweetShop_Main.scala.html
	conf/routes