this is placeholder so i can work on my desktop
Merge remote-tracking branch 'origin/master'

Conflicts:
	Beer-Journal.iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/TeamAA/Beer_Journal/EntryPage.java
this is placeholder so i can work on my desktop