Updated Code
Merge branch 'master' of https://github.com/kunzmainali/ColorCognition

Conflicts:
	assets/js/main.min.js