update
Merge branch 'master' of https://github.com/kylearchie/BrainXone

Conflicts:
	BrainXone/WebContent/css/main.css