Stuff.
Stuff.
Merge branch 'master' of https://github.com/ritwikd/gt-dashboard

Conflicts:
	server/pics/a.jpg
	server/pics/b.jpg
	server/pics/c.jpg
	server/pics/d.jpg
	server/pics/e.jpg
	server/pics/f.jpg
	server/pics/g.jpg