webinterface gets bit less ugly
Merge branch 'master' of github.com:Lyr3x/Jarvis

Conflicts:
	jarvis.rb