Updated to Jekyll 1.3.1
Added data to _data folder
Merge branch 'master' of git@github.com:Notificare/notificare-static.git
Merge branch 'master' into bootstrap

Conflicts:
	_config.yml