Merge branch 'master' into margaretBranch
Merge branch 'master' into margaretBranch
Profile controllers working. make sure profile table has info to test. Destroy is lefted blank for now.
Merge remote-tracking branch 'origin' into margaretBranch
*profile controllers are working
*some code for verification and rules have been commented out...take a look
*updated login modal to reflect session flash for error
*added CSRF construct to basemodel for added security

-MM
Added cursor change when hovering over sign in button on the "How It Works" page.
Had to add a separate navbar on the How It Works page because the color was unreadable against the background. Still has the same functionality as the one used on every other page, but is colored differently. Also added styling to the copyright and terms link (made the font smaller). Styled index.
Fixed spacing
Added parallax background and footer partial. Need to fix a styling issue that comes up on larger screens. Will ask for some input on this on Monday Dec 22
Fixed spacing and added video background CSS & JS. Not using it at this time
Changed route name from citySearch to citysearch
Added custom navbar in regards to styling. Functionality is exactly the same.
Added real peoples pictures for reviews, changed review text, and added a great background. This page is practically done. Didn't use a video because the quality was bad and it wasn't behaving like I expected.
Made the footer a partial
CSS & JS for video background. Not being used right now.
All photos being used at this point
JS for video background. Not being used right now.
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into patricksbranch

Conflicts:
	app/routes.php

Fixed merge conflict. Went with the route that followed convention (lowercase).
Merge pull request #32 from DMP-Capstone/margaretBranch

Margaret branch
Deleted route so I can merge with Denali