initial commit
new commit
hi
gemfileeee
precompile heroku
fixed merge conflicts
merge conflict
Merge branch 'master' of https://github.com/rttong/geekseek
Merge branch 'master' of https://github.com/rttong/geekseek

Conflicts:
	.gitignore
fixed bugs
pulling latest
Merge branch 'master' of https://github.com/rttong/geekseek
Merge branch 'master' into ryan
pulling
Merge branch 'master' into newbranch
deleted lightbox files
browse adjustment
text area labels
"I'm interested" inserting into interests now :green_heart:
Merge branch 'master' of https://github.com/rttong/geekseek

Conflicts:
	app/views/layouts/dashboard.html.erb