Merge pull request #314 from oslabs-beta/dev

fix version in package-lock.json

Merge pull request #312 from oslabs-beta/dev

Chronos V12

Merge pull request #321 from open-source-labs/v12

package-lock.json in folder AWS-EC2 updated to correct dependency

Merge pull request #35 from oslabs-beta/master

Launching version 5.1.0

Merge pull request #32 from oslabs-beta/master

Merge in Lock file

Merge pull request #32 from oslabs-beta/master

Merge in Lock file

Merge pull request #13 from Chronos2-0/master

Merging Chrono 2.0 into the original Chronos