Successfully merged and cleaned up
added DESIGNDOC and GRADE
fixed stupid git