.gitignore
we can now create events and query for them
Gemfile.lock
Merge conflict
Merge branch 'master' of github.com:gerow/tudu
created tasks scaffold
made it to where a user has_many tasks
fixed path issues for user tasks
fixed path issues for user events
can now query users information by email
we can now get user information by id
removed the url fields from the json for events and tasks

(they were wrong anyway)
make sure that events correctly redirects after creating through API
make sure task correctly redirects after a creation through the API
cleaned up and fixed logging in and registering... Might have broken a stylesheet and view or two... oh well
small change
Merge branch 'master' of https://github.com/gerow/tudu

Conflicts:
	rails_tudu/app/controllers/application_controller.rb
	rails_tudu/app/controllers/users_controller.rb
	rails_tudu/db/schema.rb
updated schema to reflect ross's changes
added auth token, now we just need make it possible to log in through
the API
fixed bug preventing registration