assgn1

test
Merge pull request #8 from malecki/tina-feature-pages

assgn1
ugh DS Store..
Merge pull request #3 from mm3940/assignment1

Assignment1
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	.DS_Store