Merge branch 'fix-search-results' into style-tiles
Merge branch 'style-tiles' into update-guides
Bring Angular into Show Guide page

This created a problem with the existing angular-foundation scripts.

Fixed by removing how `angular-foundation` handles accordion
Merge branch 'master' of https://github.com/FarmBot/OpenFarm into update-guides
Started fleshing out the guide creation page
Adding some basic tests, more to come
These files should have already been there?
Merge conflicts, add back button
Start building an actual edit page. Relevant to #92, #119, #128.
Updates to guide editing
Merge branch 'master' into update-guides
Start building the accordion for guides, pull in master branch, add tests
Try this
Try this, too
Merge pull request #1 from rickcarlino/update-guides

Try this
A full flow through the new create guide experience
Merge branch 'master' of https://github.com/FarmBot/OpenFarm into update-guides
Merge pull request #140 from simonv3/update-guides

Update guides according to wireframes
Merging
Merge branch 'master' of github.com:FarmBot/OpenFarm