add basic.css
Merge branch 'master' of https://github.com/KernelCorp/nostradamus
change app layout and added navbar
some changes in navbar
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock