additions to assign1
Merge pull request #63 from chilldude/master

Submission for assign1