syncing any unsaved changes
Merge branch 'master' of https://github.com/ChadAngelelli/Manana

Conflicts:
	examples/example1.manana