Initial commit
added twitter feed to timeline
added cron file - modified Tom class to handle cron
Merge branch 'master' into develop
Merge branch 'master' into feature/cron
Merge branch 'develop' into feature/cron
Cron is completed - at least for now
added google analytics
removing cache files
adding to ignore cache files
Merge branch 'release/1.0.0' into develop
Merge branch 'release/1.0.0'
Merge branch 'feature/new-feature'
Merge commit 'b130d300dc861c1cd0bddd42afe36a28c65ffec0'

Conflicts:
	README.md