ignore database config file and rakefile when merging
ajax call now supplies deck id for card creation