working form
Merge branch 'master' into jake
working form
changed table and column name MIGRATE
deleted things
merge conflicts in forms_controller and index