Fixing baseball UI
Merge branch 'master' of https://github.com/soulmatt/lucky into soulmatt

Conflicts:
	src/main/webapp/WEB-INF/views/baseball/baseball.jsp
Update .gitignore
Merge branch 'master' of https://github.com/soulmatt/lucky into soulmatt
Update UI
Update UI 2
Update UI 3
Merge branch 'jisoon'
Add Login & Join UI
Merge branch 'soulmatt'
Bug fixed badge
add dashboard streak service