merge resolve?
rolling back to before jon's authorization feature pingpong and adding some txt files to gitignore
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into develop
Merge remote-tracking branch 'johnnymo87/master' into auto_email_auth
full specs on promoting new user
ping pong on promote_new_user spec
auto email authorization feature completed
Merge remote-tracking branch 'upstream/develop' into edit_email_feature
move scenario for map coordinates to map.feature