default addedTimestamp to now in transactions
Merge branch 'master' of github.com:stephanwilliams/CS-2340-Project