?
trying to pull
Merge https://github.com/mojojoel/auction
catching up
Merge https://github.com/mojojoel/auction
Merge branch 'andrew' of https://github.com/mojojoel/auction into moniek
fucking gems
xskfasf
fixed some bugs, tidied some shit, only touched VIEWS
some stupid errors fixed
fix bid edit, updated index view with first_name linked to show bid
Merge branch 'joel' into will
image uploader
cleared head
undid will's, waiting fix
so far so good, except for bids/edit
minor shits
added env vars
added env vars
boostrap pimped