trying to fix conflicts in merging with stash
trying to fix conflicts in merging with stash
applying the stash
config file for routing
home html
moving code to home.html and using routing