ImagesFolder
These are my changes
no message
Merge branch 'master' of https://github.com/kprokken/rapid_web

Conflicts:
	hollywoodfitness/index.php
	hollywoodfitness/rates.php
	hollywoodfitness/sass/screen.scss
	hollywoodfitness/stylesheets/screen.css