Merge pull request #16 from DaoudS/bug-smashing

Fixing of file directories for all css and js files. Uniformity of navba...
Merge pull request #17 from DaoudS/master

Merge pull request #16 from DaoudS/bug-smashing