re-did the makefile to use more variables instead of writing every rule out
Merge branch 'master' of https://github.com/russloewe/webpage