preparing to pull
Continued with admin stuff
assigned IainAdmin as admin
Contnued on admin.html.erb
ready to pull
fixing errors
errors, so many errors
so many errors
Merge branch 'master' of https://github.com/seismicIain/Seismic
Set up table of users in admin page, working on showing whether they're admins
Almost finished all user/admin stuff
continued trying to allow admins to assign other admins
put ? back in