comiited changes on server
chnages to theme on server
comiited untracked changes on server
Merge branch 'MASTER' of github.com:dompascal/social-set-magazine into MASTER