delete unnecessary rake file
fixing merge conflict
fixing merge conflict
fixed merge conflict
fixed conflict
fixed merge conflict
modified for rake tasks
set primary keys for models
fixed css error
Merge pull request #83 from Ank13/usa_woot

Usa woot