merging with fahad
Merge branch 'master' of github.com:CSE512-14W/fp-tperrier-fahadp
poster session demo