trying to push again
Merge branch 'master' of https://github.com/Project-THOR/Project-Thor

Conflicts:
	nbproject/private/private.xml