Working on resize
Merge branch 'master' of https://github.com/Jumonji/NeuroCraft

Conflicts:
	src/main/webapp/index.xhtml
	src/main/webapp/prime.xhtml
Merge branch 'master' of https://github.com/Jumonji/NeuroCraft

Conflicts:
	src/main/webapp/index.xhtml
	src/main/webapp/prime.xhtml