- generated a pages controller
- created 'pages' folder inder app/views
- created 'home.html.erb' and 'about.html.erb' inside views/pages folder
- modified routes.rb file to point to home page, and point to about page
Merge branch 'master' into samDev
added pages routes for host to access
resolved routes.rb conflict
created devise views. updated routes file
resolved routes.rb conflict
Merge pull request #9 from lukemesiti/lukeDevel

created devise views. updated routes file
Looks Great :)
updated routes.rb for static pages (after pull requests)
resolved conflicts with pages, routes and pages css file
redirect non-authenticated users to sign-in page
Merge pull request #11 from lukemesiti/lukeDevel

Yay! This is sweet!
created invites model and invites controller. updated model relationships between users, events and invites.
fixed confilct with schema when adding invites table to the database.
Merge branch 'master' of github.com:lukemesiti/autismconnect
added comment to pages controller, modified routes file to put a slash inside the root method
merging from master
Merge branch 'master' into samDev
Merge pull request #13 from lukemesiti/samDev

YAY
Fixing articles controller

Deleted old articles controller and generated new scaffold.
Fixed Links controller

Deleted old links controller and generated new scaffold.
Merge pull request #14 from lukemesiti/feature_fixing_scaffolds

All good :)