To avoid conflicts with Pull
Merge branch 'HEAD' of https://github.com/mattserrano/Barista-matic.git into HEAD
Merge branch 'HEAD' of https://github.com/mattserrano/Barista-matic.git
into HEAD

Conflicts:
	barista-matic/src/main/webapp/index.html