added associations@
First attempt to add cart functionality for Touchpoints
removed item_id from orders table
cart functionality for the touchpoints working
minor changes to application view file
Restarting work post X mas break
Changed 3 static pages - Home Page, About us and Contact us
fixed merge conflict with heroku
fixed merge conflict in application controller
Fixed bug in applications html file
Fixed bug in event html page
Fixed Facebook Error
Added environment variables and repaired facebook functionality
blocked access to non-signed users
Zopim added to the site
minor formatting changes
Made ux improvements to home page
Basic Password Reset is working. 1 bug remaining to fix regarding the :to argument in the mailers
fixed email problem
Initial changes to homepage have been made