Merge pull request #3 from lukemesiti/master

Created Events Scaffold
added links model and links controller
Merge branch 'develop-emily' of github.com:lukemesiti/autismconnect into develop-emily
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
used resources instead of get in routes.rb for articles and links