resolve merging errors
Merge branch 'feature/create_file_structure' of https://github.com/cloudcomputingproject/main_repo into feature/create_file_structure

Conflicts:
	application/static/js/home.js
	application/templates/home/home_base.html