changes
Merge branch 'master' of https://github.com/troylanigan/malyut

Conflicts:
	malYut/settings.pyc
updatesss