Stop breaking Git!
Merge branch 'master' of github.com:Deco/hci400assignment
Fixing repo
Made panels double-buffered; Fixed CardGrid layout for JDK 1.6
Fixing config files
Merge branch 'articlecards'
Fixing build files
Merged master into AboutBox2