bug in controller fixed
fixing bug delete cheerup
url validation
styling landing page
changes to sign in and register views
only certain image formats accepted by carrierwave for image uploading
removing and ignoring composite_image_file folder
Merge branch 'master' into team_styling
merge master into aws
tweaking the css includes