Initial commit.
Merge branch 'master' of https://github.com/cbanawan/sophie245

Conflicts:
	.gitignore