Signed-off-by: screative2 <screative2@ubuntu>
Merge branch 'master' of https://github.com/yokesh28/palmspring.git

Conflicts:
	inner.php