Add alias for editing .zshrc
Bugfixing
Add commands for converting video
Updated settings for geany
Updated Sublime settings
Fixed erroneous tab settings for PHP
Resolved merge conflict