Putting together unit testing
Updated rails version in gemfile to 3.2.12
Issue #7 work
Merge branch 'notes' into development
Issue #7 Work
Merge branch 'development'