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

Jonathan users table
Merge branch 'master' of github.com:HexagonStorms/community-helpers into josue-customize-theme
changed color for buttons