First Commit

First
Revert "First Commit"

This reverts commit fe80bfec6c94883c9e1e97a1836ffafd7535fc78.
Clean up

Clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore