in case ffmpeg returns a float value for time, parse it as an integer
reverted changes in makefile
Update fluent-ffmpeg.js

Edit regex to allow "100%" as a valid value
Update calculate.js

Edit regex to allow "100%" as a valid value for the withSize function
Merge branch 'master' of github.com:dhritzkiv/node-fluent-ffmpeg into dhritzkiv/pull/176
Merge branch 'bugfix/timemark_float' of github.com:saschagehlich/node-fluent-ffmpeg into saschagehlich/pull/157

Conflicts:
	lib/extensions.js
Merge branch 'dhritzkiv/pull/176'
Merge remote-tracking branch 'schaermu/master'