gitignore: Update
Merge branch 'master' of github.com:LehmRob/Haushalt

Conflicts:
	.gitignore
Initial commit
AndroidManifest: Add new activities
Initial commit of the 3 central activities
MainActivity: Add onClicklisteners for the 3 Buttons
activity_main: Add buttons to the layout
strings: Add strings for button title
Update idea files