Added view for users show
Merge pull request #16 from michaelbyrd/master

Removed another completed assignments file
Merge branch 'master' of github.com:sebarmano/Submissions

Conflicts:
	app/views/assignments/show.html.erb
Fixed styling in assignments show
added a teacher boolean to user
Merge pull request #17 from michaelbyrd/teacher_flag

added a teacher boolean to user
Merge pull request #1 from sebarmano/master

added a teacher boolean to user