Merge branch 'master' of https://github.com/nathantross/project2
Merge branch 'master' of https://github.com/nathantross/project2
updates specs
fixes conflicts
adds users controller spec
fixes conflicts
delete button now looks good
want to pull upstream mater
started the distance variable
ddjf
updates spec files
Merge branch 'master' of https://github.com/nathantross/project2
resolves conflicts
distance is now active
Merge branch 'master' of https://github.com/nathantross/project2
distance to_f
adds macro funcitonality to test suite
Merge pull request #55 from amandragon/distance2

Distance2
added distance to seeds
updates files