* 'master' of https://github.com/AY1920S1-CS2103T-T12-3/main:
  Update picture paths for UG
  Update UG styling
  Fix failing tests
  Abstract parseDate method in ParserUtil
  Fix trailing whitespace
  Add Ui.png
  Update UG and dot indicator colour to green
  Make event view background white
  Allow feature box to switch to view events when event is added
  Enable scrolling for viewing events
  Add sample Records
  Updated userguide
  Update sample persons to match athlete profiles
  Remove unused import
  Correct command prompts
  Update UI image with populated training and performance
  Update UI picture
  Edit UserGuide
  Update version

* 'master' of https://github.com/AY1920S1-CS2103T-T12-3/main:
  Update for checkstyle
  Update calendar command error message to tell user range of month and year command
  Make entire command box clickable, resize command and result box
  Make long fields wrap
  Edit clear command to refresh calendar, update tests as well
  Wrap text to allow long event names to be seen fully
  Update Model stubs
  Enable clearing of performance data
  Adhere to CheckStyle
  Edit to pass test cases
  Correct error message
  Enable deleting athletes by -p flag (test cases not passed)
  Introduce flags

* 'master' of https://github.com/AY1920S1-CS2103T-T12-3/main:
  Add ability to replace existing trainings
  Update InformationDisplay to include gender
  Edit ClearCommand to delete Attendance data
  Add function to delete training
  Add template for test classes
  Add View Attendance command
  Add tests to Attendance and Training
  Edit calendar display to show training attendance in alphabetical order

# Conflicts:
#	src/main/java/seedu/address/logic/commands/TrainingCommand.java

…ds undo/redo implementation to similar to addressbook

* 'master' of https://github.com/AY1920S1-CS2103T-T12-3/main: (30 commits)
  Comply with checkstyle
  Updated for ModelStub
  Updated InformationDisplay
  Updated for performance display for selectCommand
  Test equality for Flag
  Adhere to CheckStyle
  Test DeleteEventCommand
  Test getFlag in DeleteCommandParser
  Make constructor public to allow for testing
  Test type parsers in DeleteCommandParser
  Fix EditCommand to change person details in training records
  Show generic message usage when no arguments are supplied
  Integrate DeleteTraining error message
  Recognise -t as a valid flag
  Add basic tests for Flag
  Updated to display performance
  Adhere to CheckStyle
  Modify to pass test cases
  Fix Flag toString error
  Give specific error messages for invalid inputs
  ...

# Conflicts:
#	src/main/java/seedu/address/MainApp.java
#	src/main/java/seedu/address/model/training/Training.java
#	src/main/java/seedu/address/ui/InformationDisplay.java

* 'master' of https://github.com/AY1920S1-CS2103T-T12-3/main:
  Fix checkstyle errors
  Rename all "addressbook" to "athletick"
  Edit DeveloperGuide

# Conflicts:
#	src/main/java/seedu/address/MainApp.java
#	src/main/java/seedu/address/logic/LogicManager.java
#	src/main/java/seedu/address/model/Model.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/main/java/seedu/address/model/history/HistoryManager.java