DELETE THIS STUFF
PLEASE IM BEGGING HERE
Merge branch 'development' into Rails
Merge branch 'development' into Rails

config.ru back now
Login dropdown now works
Merge branch 'refs/heads/development' into Rails