work from your place

it won't let me sync unless i commit:/
Merge branch 'master' of https://github.com/wilfreddenton/kronicle

Conflicts:
	app/views/create.blade.php
	app/views/layouts/master.blade.php
	public/css/jquery.tagsinput.css
	public/js/jquery.tagsinput.js
	public/js/master.js
w