category overhaul
site update
Merge branch 'master' of github.com:Blood-Diamond-Software/danijelj.com

Conflicts:
	public/atom.xml
	public/blog/page/10/index.html
	public/blog/page/11/index.html
	public/blog/page/12/index.html
	public/blog/page/2/index.html
	public/blog/page/3/index.html
	public/blog/page/4/index.html
	public/blog/page/5/index.html
	public/blog/page/6/index.html
	public/blog/page/7/index.html
	public/blog/page/8/index.html
	public/blog/page/9/index.html
	public/categories/apple/atom.xml
	public/categories/events/atom.xml
	public/categories/fashion/atom.xml
	public/categories/games/atom.xml
	public/categories/ios/atom.xml
	public/categories/music/atom.xml
	public/categories/photography/atom.xml
	public/categories/programming/atom.xml
	public/categories/publication/atom.xml
	public/categories/random/atom.xml
	public/categories/technology/atom.xml
	public/categories/windows/atom.xml
	public/index.html
	public/sitemap.xml
	public/tags/5th-of-november/atom.xml
	public/tags/active-directory/atom.xml
	public/tags/ahs/atom.xml
	public/tags/android/atom.xml
	public/tags/anonymous/atom.xml
	public/tags/apple/atom.xml
	public/tags/applescript/atom.xml
	public/tags/apps/atom.xml
	public/tags/appstore/atom.xml
	public/tags/australia/atom.xml
	public/tags/bash/atom.xml
	public/tags/burqa/atom.xml
	public/tags/cats/atom.xml
	public/tags/centos/atom.xml
	public/tags/chrome/atom.xml
	public/tags/cli/atom.xml
	public/tags/code/atom.xml
	public/tags/codec/atom.xml
	public/tags/codecademy/atom.xml
	public/tags/commands/atom.xml
	public/tags/copyright/atom.xml
	public/tags/curl/atom.xml
	public/tags/database/atom.xml
	public/tags/day-of-the-dead/atom.xml
	public/tags/debian/atom.xml
	public/tags/developer/atom.xml
	public/tags/development/atom.xml
	public/tags/dia-de-los-muertos/atom.xml
	public/tags/dos/atom.xml
	public/tags/dotd/atom.xml
	public/tags/emoji/atom.xml
	public/tags/evasi0n/atom.xml
	public/tags/fibonacci/atom.xml
	public/tags/freebsd/atom.xml
	public/tags/gemoji/atom.xml
	public/tags/general/atom.xml
	public/tags/git/atom.xml
	public/tags/gnome/atom.xml
	public/tags/google/atom.xml
	public/tags/halloween/atom.xml
	public/tags/handbrake/atom.xml
	public/tags/hosting/atom.xml
	public/tags/how-to/atom.xml
	public/tags/instagram/atom.xml
	public/tags/internet/atom.xml
	public/tags/ios/atom.xml
	public/tags/ipad/atom.xml
	public/tags/itunes/atom.xml
	public/tags/jailbreak/atom.xml
	public/tags/java/atom.xml
	public/tags/jessica-lange/atom.xml
	public/tags/killingfloor/atom.xml
	public/tags/linux/atom.xml
	public/tags/mac/atom.xml
	public/tags/mavericks/atom.xml
	public/tags/meme/atom.xml
	public/tags/million-mask-march/atom.xml
	public/tags/mod/atom.xml
	public/tags/movies/atom.xml
	public/tags/ms-dos/atom.xml
	public/tags/music/atom.xml
	public/tags/mysql/atom.xml
	public/tags/objc/atom.xml
	public/tags/octopress/atom.xml
	public/tags/openpgp/atom.xml
	public/tags/osx/atom.xml
	public/tags/personal/atom.xml
	public/tags/photography/atom.xml
	public/tags/photogrpahy/atom.xml
	public/tags/php/atom.xml
	public/tags/political/atom.xml
	public/tags/powershell/atom.xml
	public/tags/python/atom.xml
	public/tags/reddit/atom.xml
	public/tags/release/atom.xml
	public/tags/script/atom.xml
	public/tags/scripting/atom.xml
	public/tags/security/atom.xml
	public/tags/server/atom.xml
	public/tags/shang-hai/atom.xml
	public/tags/shanghai/atom.xml
	public/tags/shell/atom.xml
	public/tags/ssh/atom.xml
	public/tags/sydney/atom.xml
	public/tags/terminal/atom.xml
	public/tags/travel/atom.xml
	public/tags/unix/atom.xml
	public/tags/v/atom.xml
	public/tags/vendetta/atom.xml
	public/tags/video/atom.xml
	public/tags/virtualbox/atom.xml
	public/tags/wget/atom.xml
	public/tags/windows/atom.xml