Update .gitignore
Add main.cu & Makefile
Merge with master