cleanup
added kaminari and rspec
removed testunit
updated rails // fresh start
added scaffolds
first user draft
fixed merge conflicts
Merge branch 'RAILS_UP2DATE'