new features!
new features! implementation
added some awesome boxes!
some awesome js
implemented awesome javascript
Merge branch 'DB-box'

Conflicts:
	src/main/webapp/index.jsp