Merge pull request #3 from manzalena/master

filled out list
Merge pull request #4 from manzalena/master

added modal to info button in footer
Merge pull request #5 from manzalena/master

modal has text now
Merge pull request #6 from manzalena/master

avatar pngs to img folder
Merge pull request #7 from manzalena/master

Added a column for the avatar
added card trick video
updated video
added some js then commented it out
merge?
cleaned up problems from last merge
Merge pull request #10 from manzalena/master

2-col layout + modal in footer
fixed last png temporarily
magda's changes
Merge pull request #11 from manzalena/master

fixed modal background
put video back
up
fixed weird errors
fixed weird header problem
updated
testing php scripts