testing
more tests
adding date and time methods
added jasmine
fixed date and time js methods
merge conflicts resolved