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
updates spec files
Merge branch 'master' of https://github.com/nathantross/project2
resolves conflicts
Merge branch 'master' of https://github.com/nathantross/project2
adds macro funcitonality to test suite
updates files
fixes conflicts
Merge branch 'master' of https://github.com/nathantross/project2
Merge branch 'master' of https://github.com/nathantross/project2
latest version
fixes conflicts
Merge branch 'master' of https://github.com/nathantross/project2
removes unnecessary goals routes
cleans up user routes