I'm just SO darn helpful
Merge remote-tracking branch 'upstream/master'
Sprint two
(sp)
Cleaning up junk so team has easier time collaborating
Moving js panel to html, still incomplete though - will fix
Merge pull request #48 from kidaki/master

Moving js panel to html, still incomplete though - will fix
more cleaning/arranging
Clean template. Or atleast clean enough. Attempting to push, then attempting to merge. Will assign balsamiq bits to people soon.
Merge branch 'master' of https://github.com/SonOfLysander/ragingDipsticks into SonOfLysander-master
wait... now we're merged?
Renamed file
Better comments and added a couple variables
Merge pull request #50 from SonOfLysander/master

Better comments and added a couple variables
Fixed typos
Merge pull request #51 from SonOfLysander/master

Fixed typos
Got a dialog working with the correct image set. Thank you stack overflow for helping out with getting the images to appear for the dialogs!
Dialog for adding a new friend added. Made email optional. Line 130 in dialog.js is where the data then would be sent to the database or wherever the friend is being stored at
Merging together
took out head stuff