Adding initial code generated by mix to repo
Resolving differences between local and default GitHub versions of files