branch test
Revert "branch test"

This reverts commit 5141917c7626d605d0e76f6a18df6b821382b006.
branch test 2
branch test 3
140507 Restructured Event class

Modified __init__ to only apply event attribute
Only contains 'event' attribute
timestamp() takes string instead of dict
Added validate() to check for appropriate fields
Renamed functions for better readability and made them static
Split timestamp 'converting' and 'formatting'
Replaced 'start' and 'end' functions with accessor functions: get_start and get_end
Still need to modify duration()