getting going on Aveda comp
Added all the bits for the Aveda comp
Merge branch 'christmas_comp' into development

Conflicts:
	images/competition/aveda_christmas.jpg