need to pull
just pulled
corrected fixtures and controller tests with updated schema
repaired client validation
pulled and fixed local master
going to push
continued work on devise
fixed merge confilcts
adding changes