commit to pull
resolved conflict
commit to pull
Merge branch 'master' of https://github.com/srizzling/BuyABrick
pull
pull attempt 2
merge
Merge branch 'master' of https://github.com/srizzling/BuyABrick
updating gemfile
Merge branch 'master' of https://github.com/srizzling/BuyABrick
pulling
Fixed
Merge branch 'master' of https://github.com/srizzling/BuyABrick
Merge branch 'master' of https://github.com/srizzling/BuyABrick
added columns to users
merging
spelling mistake
created a users controller