Richard Harrington 4c90966445 fixed merge conflict

2013-08-21 19:23:18 -04:00

..

css

separated out css from index.html

2013-08-19 13:26:53 -04:00

js

fixed merge conflict

2013-08-21 19:23:18 -04:00

index.html

tightened up html (cosmetic)

2013-08-19 13:28:07 -04:00