4 commits

Author	SHA1	Message	Date
Eryn Wells	c389dc5581	Merge remote-tracking branch 'fork/feature/ui' into feature/ui ... Conflicts: templates/graph_base.html templates/navbar.html urls.py views.py	2012-08-18 16:12:56 -07:00
Eryn Wells	e044dbf19a	Dropdown menu for user stuff	2012-08-18 12:42:22 -07:00
Eryn Wells	2da6b7395c	Graph base template	2012-08-18 12:42:22 -07:00
Eryn Wells	1fb1bec70e	Graph base template	2012-08-18 09:48:10 -07:00