Creating template
Merge branch 'master' of ssh://arduinosite-arduinosite.rhcloud.com/~/git/arduinosite

Conflicts:
	config.ru
Remove heroku compliancy
Removed some stuff I don't use