Merge pull request #32 from damouse/ajax

Ajax
update before merge
merge fix;
uh oh
merge fix;
added git ignore changes
merge fix
delete db/dev temporarily for merging