server side 1st commit
Merge branch 'master' of https://github.com/R4trtry/trueFitSkinCare

Conflicts:
	front_end/app/views.py
	front_end/app/views.pyc
working on AWS! yeah!
add slides
updates on the front end