Benerin CSS :v
Merge branch 'master' of https://github.com/faizilham/IF3110-Tubes-II

Conflicts:
	WebContent/css/modal.css
	WebContent/template/template.jsp