add javascript and JSON files
Fixed merge conflicts
Merge pull request #13 from jacob-nappi/calendarDev_1.1

Calendar dev 1.1
Merge pull request #14 from jacob-nappi/calendarDev_1.1

Fixing bad commit
add images folder