things be workin...for now
forgot to add dem files
ignore gedit stuff
hide our files
fixed conflicts