after reset, removed bootstrap-theme and added bootstrap-extras
Merge branch 'master' of http://github.com/ptpermaculture/black_earth_testing
pulled checked on local server