created Events scaffold
fixed the shcema classhes, due to migrations. kept the most recent
Merge pull request #3 from lukemesiti/master

Created Events Scaffold
added the schema
Merge branch 'master' into lauren

Built a fresh version of the db/schema.rb
Conflicts:
	db/schema.rb
Merge pull request #5 from lukemesiti/lauren

Lauren
added links model and links controller
created articles model and articles controller
- 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 'develop-emily' of github.com:lukemesiti/autismconnect into develop-emily
Merge branch 'master' into samDev
Merge pull request #7 from lukemesiti/lauren

Created articles model and articles controller
added pages routes for host to access
Merge branch 'master' of https://github.com/lukemesiti/autismconnect

Fixed conflict in user.rb, routes.rb and schema.rb
Conflicts:
	app/models/user.rb
	config/routes.rb
	db/schema.rb
resolved routes.rb conflict
used resources instead of get in routes.rb for articles and links
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