styled form
removed merge lines
added routes and @url
set up adding
AJAX on rails!
No AJAX
merged from master