ubermenu for wordpress, Sublime FTP, php.ini and other files added to ignore
Merge branch 'master' of https://github.com/dompl/.gitignore

Conflicts:
	gitignore.txt