changed colours and stuff
minor changes
Merge branch 'master' of github.com:Meraz/thorbear into colour_stuff
Memory stuff