Added some new files pertaining to Timeline.js showing up
Merge branch 'master' of https://github.com/leadherforward/leadherforward

Conflicts:
	public/javascripts/script.js
Added timeline.js stuff. Need to re-add script.js