Better approach to Twitter email and Facebook location
fix form inputs labels

some form inputs has a wrong "for" attribute
Add OpenShift deployment instructions
Merge pull request #51 from abimaelmartell/fix/form-labels

fix form inputs labels
Merge branch 'master' of https://github.com/dstroot/hackathon-starter into dstroot-master

* 'master' of https://github.com/dstroot/hackathon-starter:
  Better approach to Twitter email and Facebook location
Safe reference Facebook profile location
Adds Steam auth and API
Radio button text wrapped with span tag
Fixed missing checkbox images, tweaked radio button styles
Merge branch 'master' of https://github.com/KarlJakober/hackathon-starter into KarlJakober-master

* 'master' of https://github.com/KarlJakober/hackathon-starter:
  Adds Steam auth and API
Placed lock icon outside of URL
Update README
removes steam auth, sets up steam api requests in async
Merge branch 'master' of https://github.com/KarlJakober/hackathon-starter into KarlJakober-master

* 'master' of https://github.com/KarlJakober/hackathon-starter:
  removes steam auth, sets up steam api requests in async
Steam API code refactoring, added ownedGames API call
Steam API template display achievements
Add profile information and owned games to Steam template
Merge branch 'KarlJakober-master'

* KarlJakober-master:
  Add profile information and owned games to Steam template
  Steam API template display achievements
  Steam API code refactoring, added ownedGames API call
  removes steam auth, sets up steam api requests in async
  Adds Steam auth and API

Conflicts:
	views/api/index.jade
Merge branch 'KarlJakober-master'

* KarlJakober-master:
  Add profile information and owned games to Steam template
  Steam API template display achievements
  Steam API code refactoring, added ownedGames API call
  removes steam auth, sets up steam api requests in async
  Adds Steam auth and API

Conflicts:
	views/api/index.jade
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   README.md
#	modified:   app.js
#	modified:   config/passport.js
#	modified:   config/secrets.js
#	modified:   controllers/api.js
#	modified:   models/User.js
#	new file:   views/api/steam.jade
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   config/passport.js
#	modified:   config/secrets.js
#	modified:   models/User.js
#	modified:   views/api/index.jade
#
Re-arranged routes, added comment blocks