Commit 4

Signed-off-by: Stephen Gradinscak
Signed-off-by: Stephen Gradinscak <stephengradinscak@mac141726.med.cornell.edu>
Merge branch 'master' of github.com:sgradinscak/wild-river

Signed-off-by: Stephen Gradinscak <stephengradinscak@mac141726.med.cornell.edu>

Conflicts:
	index.html
Commit 5

Signed-off-by: Stephen Gradinscak <stephengradinscak@mac141726.med.cornell.edu>