removed reference to bootstrap.css since we're not using bootstrap
Add Task Type Constants
Author: Cole
Commit: Add a TYPES constant in the Task model for accessing task types throughout the app.
Subject: Issue #2, login status
Author: Neil
-added login status and logout button
-login status available in all views
Install devise
Author: Cole
Commit : Install devise and configure
Basic Task Validation
Author: Cole
Commit Add some basic validation when creating a new task.
Change webserver from Webrick to Thin to get rid of this annoying message in the console:

[2013-03-19 16:03:42] WARN  Could not determine content-length of response body. Set content-length of the response or set Response#chunked = true
Add further task validations
Author: Cole
Commit: Add some additional and more specific validations to Task model
moved all my public folder contents to new rails app public folder
cleaned up forms
-removed options for user id
-removed options for deleting tasks
-updated completion time field to be a checkbox
-new task form now has a task type dropdown
New tasks are now associated with the current user id - issue #4
Selecting the completed check box now writes the completed time to the database
Updated Type Task views to show task name instead of value
Issue #8: new task generation upon sign up
-work in progress
-created customization for User controller. Still not implemented.
update Gemfile.lock
moved log in and tasks files with css/js from public folder to views; also converted devise login page to new design
created new pages in app/views/tasks with main form elements needed
changed file names; removed extraneous .html extension on erb files
Add total_completed function to Task model - Fixes #31

-Calling 'Task.total_completed(current_user.id)' will give you a
  count of completed tasks for that user
Subject: fix #8 initialize tasks made upon user login
author: nil
-user will have 25 tasks made upon login
Merge branch 'master' of github.com:NeilMakn/kix_rails into neilson

Conflicts:
	app/controllers/tasks_controller.rb
	app/views/tasks/index.html.erb
Merge branch 'neilson' of github.com:NeilMakn/kix_rails into neilson

Conflicts:
	app/controllers/tasks_controller.rb
	app/views/tasks/index.html.erb