Too much stress!
Merge pull request #14 from LukasGalliker/master

Too much stress!
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team9

Conflicts:
	documentation/srs/Shoppyapp - Requirements Specification.docx
Added Shoppy-App-Directory

I ha es nöis Projekt erstellt im Ordner ShoppyApp. Hoffe es passt aune
:) Have fun Programming
Awkward 2. Commit

Irgendwie hets nid gad aues commited bim erste... :D
Merge pull request #15 from broggi/master

Added ShoppyApp Project
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team9
added handler for local database and simple user- and shoppinglist-classes
added handler for local database and simple user- and shoppinglist-classes
Created Welcomescreen

Designed Welcomescreen and added Function for creating User-DB-Entry and
then jump to DisplayListsActivity
Added colors.xml for colors
Deleted DisplayListsActivity and generated Files

Deleted DisplayListsActivity and its generated Files and added the
Shoppingcart-image
Merge pull request #17 from broggi/master

Designed Welcomescreen etc.
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team9
Add functionality
Remade DisplayLists

After failed implementation reimplemented everything
Merge pull request #18 from broggi/master

Remade DisplayLists etc
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team9
Implemented ContextMenu with Deletefunction
Merge pull request #19 from broggi/master

Implemented ContextMenu with Deletefunction
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team9