this is a new feature again - cause I'm awesome
Merge branch 'wtf' into test_feature
new php file added
Merge branch 'super_awesome_new_stuff' into test_feature
fixed conflicts