started working on views and styles
started working on views and styles
d
d
Testing name shows up correctly
Merge remote-tracking branch 'origin/styling' into styling
Added more layouts
Working on some more templates including the feedback page
Working on some more templates including the feedback page
Added commenting
resolved name changes to files
styled ranking template
Rubric form for teachers
Added design files

Signed-off-by: Pritika Nilaratna <pritika.16@gmail.com>
design file
Merge remote-tracking branch 'origin/styling' into styling

Conflicts:
	design.psd
Updates to styles
login stuff
socket commit
temp rank