started mse
Merge branch 'master' of https://github.com/helme/bachelor2014

Conflicts:
	bntools.py