Merge branch 'master' of github.com:NeilMakn/kix_rails
Merge branch 'master' of github.com:NeilMakn/kix_rails
Subject: Add Category Subtasks
Author: Cole
Commit: Add the list the subtasks under each category
Add jquery and app.js files to show and hide subtasks
Subject Button States to Tasks
Author: Cole
Commit: WIP Add button select states to task categories and sub tasks
Merge from master
Merge branch 'master' of github.com:NeilMakn/kix_rails
Merge pull request #38 from lavapj/master

added design/CSS styling to login/signup/pwd pages
Subject: Progress Bar UI
Author: Cole
Commit: Move task page to view and fix asset links.
Implement progress bar UI
Convert app.js to coffeeScript in tasks.js.coffee
Add additional styles and convert kix-styles to scss extention
Make task panels closed by default
Merge branch 'master' of github.com:NeilMakn/kix_rails
Merge pull request #40 from ichabodcole/master

Progress Bar  UI Update
fixed CSS conflict between pages