added base.html and changed other files to use it
merged