Merge branch 'master', remote-tracking branch 'origin' into stage
minor style change
Merge branch 'stage' of github.com:WhiteSparrow/Public-Page into stage