first commit

Signed-off-by: etcher3rd <etcher3rd@gmail.com>
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	.gitignore

Signed-off-by: etcher3rd <etcher3rd@gmail.com>