poep
Merge branch 'feature/web-dev' of https://github.com/dolstrm001/Demeter-Project into feature/web-dev

# By dolstrm001
# Via dolstrm001
* 'feature/web-dev' of https://github.com/dolstrm001/Demeter-Project:
  fixes for server added works fine now :) + folder pages renamed to templates