Made data changes to support CNN and bug fixes with naming of chronologies
Merged changes with new naming of chronologies
Merge branch 'master' of https://github.com/UnicycleLabs/chronos-prototype
Merged sample data