Merge pull request #4 from kaosu64/master

Milestone 3 - Added timeline
milestone 4
Merge pull request #5 from mindBeef/master

milestone 4