boot strap template copied
Merge branch 'master' of https://github.com/nanophate/ASRWeb into oltd-state

Conflicts:
	views/layout.erb
deleted the swp
 Please enter the commit message for your changes. Lines starting
BootStrap content fix
deleted buggy content in layout
Merge pull request #1 from nanophate/old-state

Old state