update
Signed-off-by: Jan Kristanto <vcrack.0206@gmail.com>
Merge branch 'master' of https://github.com/jankristanto/mythesis

Conflicts:
	app/webroot/files/jan.out
	app/webroot/files/jan.test

Signed-off-by: Jan Kristanto <vcrack.0206@gmail.com>