first commit
Merge branch 'master' into aftership-master

Conflicts:
	.gitignore
Merging Repository to Aftership's Main Repo Fork for Pull Request
Fixed the json content-type issue