new
changes
Merge branch 'master' of https://github.com/Spindelmyran/femirad

Conflicts:
	package.json
	views/about.ejs
	views/content.ejs
	views/footer.ejs
	views/header.ejs
	views/index.ejs
	views/memory.ejs