Changes
Merge branch 'master' of https://github.com/zsaraf/lovestep

Conflicts:
	lovestep/MainWindowController.mm