Ben Balter eb65fab847 Resolve merge confict with #91

2013-07-13 10:51:38 -04:00

..

default.html

Resolve merge confict with #91

2013-07-13 10:51:38 -04:00

license.html

move header and footer to includes

2013-07-13 10:38:53 -04:00