Before.
Merge branch 'master' of github.com:monokrome/jaded-test

Conflicts:
	.gitignore