updated .gitignore

Signed-off-by: Jacob Procee <sn125164@gmail.com>
fixed merge conflict

Signed-off-by: Jacob Procee <sn125164@gmail.com>