Added brianllamar's solutions

I also removed baritollo's assignments. They are returning a 404
fix conflicts