Merge branch 'master' of /home/atlantis/dmph11/dmph1113/Desktop/Group Project/HupuMedia with conflicts.