Test merge

app.php for testing
Add netbeans directory to ignore