Added Users Table
Edited Local File
fixed merge conflict
Merge pull request #2 from HexagonStorms/jonathan_users_table

Jonathan users table
Corrected Migration Syntax
Merge pull request #3 from HexagonStorms/jonathan_users_table

Corrected Migration Syntax
Merge branch 'master' into frank_jobs_table
Created jobs table and updated users table.