compile
testing something
pulled new fixes
changed links to actually work, added placeholder on website text fields for url
fixed some margin issues
css merge conflict
merge conflicts