search

Zabari / STEPS

4 stars 2 forks source link

Merging UI into Master #8

Closed afischer closed 9 years ago

afischer commented 9 years ago

Lotsa new stuff. Using bootstrap to have mobile supprt, etc. API support incoming.

afischer commented 9 years ago

Urgh conflicts one moment please

afischer commented 9 years ago

HOLY MOLY IT MERGED DO NOT PULL UNTIL I TEST

afischer commented 9 years ago

All is good in the world, feel free to pull. I'm not deleting this branch in case something goes horribly, horribly wrong