changed settings (need to fix m2_home environment variables)
added header / placed navbar outside header / added avatar
strange settings file which keeps auto updating. We need to try and ensure our environments are the same before we continue
trying to resolve conflicts
deleted dreaded dsstore
Merge pull request #5 from Hugo-farroba/header

Added header with avatar placeholder