no message
no message
no message
no message
Merge branch 'master' into feature/peony

Conflicts:
	pages/js/min/main.min.js
mispell to index, added images for readme
Merge branch 'front_end'
adding images to master