Initial commit

Signed-off-by: David Dorfman <wiz3kid@gmail.com>
Merge branch 'master-'