merge
Merge branch 'master' of github.com:chairmanmeow50/Brainspawn

Conflicts:
	brainspawn/plots/plot.py
	brainspawn/views/plot_view.py