code kit stuff
Merge branch 'master' of https://github.com/SMLMRKHLMS/aesthetly

Conflicts:
config.codekit
css/styles.css
styles.scss
Merge branch 'master' of https://github.com/SMLMRKHLMS/aesthetly