merge paperclip with design
fixed user model
Merge branch 'master' of https://github.com/orientalstirfry/popstart.me