Initial Commit
Merge branch 'master' of github.com:boxcar21/APIStack

Conflicts:
	.gitignore
Merge branch 'master' of github.com:boxcar21/APIStack

Conflicts:
	.gitignore