makes some tweaks to layouts
adds base layout
resolved merge conflict
adds a gitignorefile