Initial commit
Added entries from GitHub
Resloved conflicts from remote