ajax no longer needs page refresh
resolved merge conflict
Merge branch 'stbarrientos-testing-ajax'