dansup/Hyperboria.net — pull request #11 by xgalvin (2012-03-12 01:49:09+00:00)
Title: Stop fixing stuff!!!

You should be able to do a fast-forward merge.

Changes:

* fixed learn more button
* fixed body padding for nav (50px -> 40px)
* adjusted footer padding
* removed unused styles
* added bootstrap dependency (icons)
* is third column needed? place holder for now.

To do:

* nav padding for >960px wide window (responsive bug)
* break down shared elements into php includes for pages