fixed board model conflict
fixed merge conflict
fixed merge
fixed board merge conflicts
fixed merge conflict in board model
fixed merge conflicts
created view for sessions, boards, users. Updated controllers
Merge branch 'development' of https://github.com/sweetlevy/Project_2_Grumpy_Cat into development
Merge branch 'sj_board3' into development

Conflicts:
	tmp/pids/server.pid