commit
Merge branch 'master' of https://github.com/pallavikhandekar/LearningLabs

Conflicts:
	LearningLabs/LearningLabs/__init__.pyc
setting update