plugin
Merge branch 'gh-pages' of github.com:gertt/starter into gh-pages

* 'gh-pages' of github.com:gertt/starter:
  Updated emoji_for_jekyll.rb
  Created emoji.json
  Deleted _plugins/2014-09-01-your-filename.md
  Updated emoji_for_jekyll.rb
  Deleted emoje_for_jekyll.rb
  Updated emoji_for_jekyll.rb
  Created 2014-09-01-your-filename.md
  Created emoje_for_jekyll.rb
  Created 2014-09-01-your-filename.md
  Updated _config.yml
  Updated _config.yml
  Updated _config.yml
  Updated _config.yml
  Updated _config.yml
  Updated _config.yml
  Deleted media/test.file
  Updated 2014-08-26-gert-s-awesome-post.md
  Created CHART_BBBX_AMBASSADOR_PROCESS_EVENT.png

Conflicts:
	_config.yml
	_plugins/emoji_for_jekyll.rb