Merge branch 'master' of http://github.com/kraftlj/FRAP-Toolbox

Conflicts:
	README.md
Merge branch 'master' of http://github.com/kraftlj/FRAP-Toolbox

Conflicts:
	README.md