fix merge conflicts
add some links
ignore profile photo uploads
Merge pull request #38 from LaunchAcademy/foundation

RFR Foundation
Resolve merge conflict
Resolved merge conflict, fixed links
Merge pull request #36 from LaunchAcademy/adding_lots_of_links_ea

Adding lots of links ea