Wrote Disrpt
Update web interface and java code
Update layout and add make some stuff work
Merge branch 'matheus' of github.com:kmacdon1/COMP-3415-ResidenceProject into matheus
Merge remote-tracking branch 'origin/matheus'

Conflicts:
	Version 1 - Standalone Java
[Incomplete]/libs/mysql-connector-java-5.1.33-bin.jar
	changes.log
	web-gui/index.jsp