Merge pull request #16 from COSI236TA/integrate

Integrate
dashboard layout
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate

Conflicts:
	app/views/dashboard/index.html.erb
Reverted to previous verious
Added root/login|logout, changes to layout header