displays splash page and centers map when app first runs
Merge branch 'master' of https://github.com/kayellpeee/Fillmeup

Conflicts:
	client/app/index.html
	client/app/scripts/controllers.js
Merge branch 'master' of https://github.com/SmoothBrew/Fillmeup
Merge branch 'master' of https://github.com/SmoothBrew/Fillmeup
Merge branch 'master' of https://github.com/SmoothBrew/Fillmeup
Merge branch 'master' of https://github.com/SmoothBrew/Fillmeup
(fix) Change image size and clickable shape so entire mug displays
Merge pull request #37 from kayellpeee/fix/imageSize

Fix/image size