Finished basic website
Basically finished news detail displaying
Merged with dev