Archiving files and cleanup for moving repo to its new home on Github.
Resolving merge conflict.
Resolving merge conflict.