First commit for semster
Merge github.com:dy45/IS218_Fall2014