Web app
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web app/app/Plotter.py
Merge branch 'master' of https://github.com/Zeliax/DataMiningUsingPython