?
trying to pull
Merge https://github.com/mojojoel/auction
catching up
Merge https://github.com/mojojoel/auction
pressable buttons
adding wills changes
Merge branch 'master' of https://github.com/mojojoel/auction into andrew
bid
Merge branch 'moniek' of https://github.com/mojojoel/auction into andrew
added ability to bid on item at items/index level
fucking gems
xskfasf
fixed some bugs, tidied some shit, only touched VIEWS
image uploader