initial commit of berrylicious
Merge branch 'master' of https://github.com/robberry90/berrylicious

Conflicts:
	.gitignore