model logic working
merges fixed
update tons of tables and forms
users created
pulled ramin branch
complete awesome tables
multiple users working
pulled andyys branch
user sign up working
radio buttons
Some minor changes