removed some files
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx

Conflicts:
	config/database.yml