Updated Specrunner to look in right place
Implementing Database
Fixed Javascript links in index.erb
Merging with develop