asd
Merge branch 'master' of https://github.com/EmrahSignorini/LaBarista2

Conflicts:
	Documents/workspace/LaBaristaTest/.DS_Store
asd