Test with tags plugin
Edited .gitignore
Merge branch 'dev' of git://github.com/Macxim/macxim.github.com into dev

Conflicts:
	.gitignore
	index.html
	tags/development/index.html
	tags/jekyll/index.html
Changed tag template [test]