updated .gitignore
changed in/out convention
Merge branch 'master' of github.com:jmejia8/programming-problems into jmejia8-master

Conflicts:
	1224 - GPS/in.txt
Merge branch 'jmejia8-master'