Update rooms
Display QA session in Lynnhaven room
Add Dan's profile
Removing Dan's ubuntu session.
Merge pull request #24 from chrisryan/master

Updated Dan's profile information.
Merge remote-tracking branch 'chad/master'

Conflicts:
	src/templates/people.html
Made break span the columns.