Merge branch 'master' of github.com:paceuniversity/gsd2014-team1

now I really added the psds

added psds and stuff

Uploaded presentation, thought I did this already

refactor for prez

Merge remote-tracking branch 'origin/master'

ready for prez

updated gitignore for scharffs docs

more stuff

remove dead Horiz Table

rename

ugh

Merge pull request #18 from paceuniversity/newCode_sansSub

rewrite to get rid of sub modules

removed subproject