Fixed static files routing
Merge branch 'dev' of http://www.github.com/whizkid338/online_journal into dev

merging don's changes with mine