able to sort by time
working on sorting
Merge branch 'master' of https://github.com/timsants/CS147-Project
got regex to work
date and time storing to DB works now
fixed conflicts