fix student & admin controller. uploading pics & changing seed data
fix merge conflicts. update seeds.
edit students controller
update db seeds to new pics
Update admin, student controller update
Merge branch 'maebeale-master'