pushing test
new page
Added timeline
minor updates
Merge branch 'gh-pages' of https://github.com/luttigdev/Final-Project into gh-pages

Conflicts:
	index.html
Change timeline bg
Fix timeline coloring
removed placeholder stuff from homepage
fixed danny's mistakes
fixed more of danny's issues
asdf
incredibly robust. i think we should start a startup with this website. i'll submit to ycombinator tonight.
beautiful, seamless design.
everything runs in constant time now
proved P=NP
proved that our website is turing complete
rewrote os x in assembly
added 4 images for forces
Merge branch 'master' of https://github.com/luttigdev/Final-Project

Conflicts:
	index.html
suz commit to gh-pages