updated variables and colors
Merge branch 'master' of https://github.com/palanii/Crisis_Management

Conflicts:
	.gitignore
	app/styles/css/sass/_colors.sass
Merge branch 'master' of https://github.com/palanii/Crisis_Management

Conflicts:
	.gitignore
	app/styles/css/sass/_colors.sass
	app/styles/css/sass/_variables.sass