Merge pull request #11 from eas604/master

collecting integration changes
Merge pull request #12 from eas604/master

God help us
Merge pull request #18 from TEAM2-ISC567-FALL14/master

Merge pull request #11 from eas604/master