Remove php tag to prevent IDE showing syntax error
Ignore nbproject folder
Work in progress
WIP
ignore .idea
fixed conflicts