Renamed file
Merge branch 'feature' of
https://github.com/gitander/sandbox-check-the-hub.git into feature

Conflicts:
	original.php