Merge branch 'master' of https://github.com/punitshah/colorlights

Conflicts:
	.gitignore
fixed conflicts around gitignore
fixing credentials.h issue
fixed conflict
fix credentials.h
fix credentials