Working on creating and editing assignments
Working on resolving conflicts
Merge branch 'master' of https://github.com/derektom14/HackRice2014