Captured edited
Merge branch 'master' of https://github.com/wsycharles0o/JARVIM.git
FINALIZATION 1

Signed-off-by: wsycharles0o <wsycharles0o@hotmail.com>