added welcome.php to mockup
added welcome.php to mockup
be greeted with colors
show me some more colors
Merge remote-tracking branch 'origin/nils'
there be borders
oops that .php should be online as well i believe
i like these colors more
wow that green was far too .. green
and that was more like brown
this green should be fine
it wasn't, of course
Merge branch 'master' into nils

gimme those master updates
so the welcome.php should be in the correct place now
and the css files as well
there's just this error..
cleaned up the mockup folder (deleting is the best cleanup)
Merge branch 'master' of https://github.com/phyzi/progize into robin