Cooler electric blue stuff
updated gitignore
Merge branch 'dev'