Revert "wulan : masukin file"

This reverts commit 4a1a4dc9b5a2ef7fb6b0565291210c808e7033fc.
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/application.conf
Merge branch 'master' of https://github.com/thenextprogrammer/wisata