Added a Printline statement for testing
Merge branch 'friends'
Main page design work
Started grid article view
Updated to better Swing framework
Made article grid better
Created CardGrid class for displaying grids of article cards
Created CardGrid class for displaying grids of article cards; Introduced modes to ImagePanel for various image sizing options
Fixed accidental commit
Test commit
Added .gitignore
Applied .gitignore to rid of improperly tracked files
Merge 'articlecards' into 'master'
Fixing file permissions
Removed private nbproject
Merge branch 'aboutbox'

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
Merge branch 'master' into aboutbox
Managed Conflicts