devi first commit :p
Merge branch 'master' of https://github.com/yonatan-nugraha/RedElephant
Merge branch 'yonatan-branch'
Merge branch 'yonatan-branch' of https://github.com/yonatan-nugraha/RedElephant

Conflicts:
	sites/all/modules/redelephant/redelephant.inc
fixed conflict
fixed conflict
Merge branch 'yonatan-branch'
yonatan ninth commit