Merging in old conflicted files
-fixed bugs
-completed add command
-checks for errors, syntax errors
-gotta catch them all (errors)
-fixed syntax error with ( )
Merge pull request #29 from clhliu/master

Add command
Merge branch 'master' into picasso