mychanges
Merge branch 'master' of https://github.com/tonocm/HackerChat
profile
adding page to store hackathons
Merge branch 'master' of https://github.com/tonocm/hackerchat
profile
Merge branch 'master' of https://github.com/tonocm/hackerchat
updating the dashboard
adding in hack instead of myhacks
actually add the hac
Stylin!
Merge branch 'master' of https://github.com/tonocm/HackerChat into mikeDev

Conflicts:
	npm-debug.log
Merge pull request #1 from tonocm/mikeDev

Mike dev
Merge branch 'master' of https://github.com/tonocm/hackerchat

Conflicts:
	npm-debug.log
ignore logs for less merge conflicts
committing some stuff
Merge branch 'master' of https://github.com/tonocm/HackerChat

Conflicts:
	app.js
adding mongo and chat

sub commit message
Merge branch 'master' of github.com:tonocm/HackerChat

Conflicts:
	app.js
	npm-debug.log
	routes/index.js
updating index