creating dashboard.
working on dahsboard.
Merge branch 'master' into LeKohrs
preparing to merge.
Merge branch 'master' into LeKohrs
fixed dashboard.
added style to dashboard.
preparing to merge.
resolved merge conflict.