Creating template
inital tranfer
added htacess and gitignore
http to https
.
git ignore and update
Merge branch 'master' of ssh://3709f44b4e7247f38ce703e9f7ce35d2@GiftFinder-BBBros.rhcloud.com/~/git/GiftFinder.git/

Conflicts:
	.gitignore
	.openshift/action_hooks/build
	.openshift/action_hooks/deploy
	.openshift/action_hooks/post_deploy
	.openshift/action_hooks/post_start_php-5.3
	.openshift/action_hooks/post_stop_php-5.3
	.openshift/action_hooks/pre_build
	.openshift/action_hooks/pre_start_php-5.3
	.openshift/action_hooks/pre_stop_php-5.3
	.openshift/cron/weekly/chronograph
	application/controllers/main.php
	application/views/index.php
	application/views/result.php
	php/js/Home.js