blabla
b
Version 14
Deleted old files
a
Merge branch 'master' of https://github.com/thomaskreuz/SPIKY-paper

Conflicts:
	SPIKY13.aux
	SPIKY13.log
	SPIKY13.pdf
	SPIKY13.synctex.gz
	SPIKY14.tex.bak