tidying up sign up page
Merge branch 'master' of github.com:srizzling/BuyABrick
nan desuka??
pushing changes
resolving conflicts and pushing changes