Merge branch 'master' of https://github.com/vankatwijk/bee
project to not be erased while changing branches + minor bug fix
Merge branch 'master' of https://github.com/vankatwijk/bee
Weka
WEKA
weka
project files + weka stuff
Merge pull request #7 from vankatwijk/ServletConnection

implementation of syncronisation
Working Weka
Update .gitignore
Weka working version
BeeHappy UI Update
Fixed tiny bug in the ui
Merge branch 'master' into ServletConnection

Conflicts:
	android WS/BeeHappy/res/layout/fragment_main_dummy.xml