partial commit
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceMan/MainController.py
partial commit
added login button
Merge remote-tracking branch 'origin/master'
partial commit
Merge remote-tracking branch 'origin/master'
partial commit
Merge remote-tracking branch 'origin/master'
merge of mine and sam's features