Added alias for Solegraphics build script
Fixed merge conflicts
Merge branch 'develop' of https://github.com/theutz/utz-my-zsh into develop
Merge branch 'master' into develop
Added alias to edit httpd conf
Merge branch 'release/0.0.2'

* release/0.0.2:
  Added alias to edit httpd conf
  Added alias for Solegraphics build script