added ds store
added images
Created labels and added charts
Fixed form error
Added colour themes
Added new chart icon to navbar
Merge branch 'fixing-design-flaws'

Conflicts:
	log/development.log