Initial Import
add: gitignore for netbeans project, vim swap, temp files and merge .orig files
Merge remote-tracking branch 'origin/master'