Merge pull request #3 from kevinweaver/master

did a lot of great work
Steve trying to fix everything but making little progress 1/18 00:37
Steve messing around 1/19 15:32
Steve messing around 1/21/13 22:55
Merge pull request #4 from unclelarrysvan/master

Steve messing around
Fixed answers controller and views after routes changed.
Removed dependency on issues for disciplines controller
corrected has_many through on disciplines and issues
removed disciplines_issues table (was a duplicate of issue_disciplines)
started seed
Started work on layout
added .swp to .gitignore
fixed gitignore for database.yml
Pended broken feature test
Made password a password field
Added question list to discipline show view
Updated 'Back' links on answers_show and questions_show
Updated disciplines/show table to include new question link
Added disciplines, questions, and answers to db/seeds
Added discipline_id number field to question _form
Added answers to question show
Merge pull request #11 from unclelarrysvan/master

Added a few shits