starting a new branch to test amazon stuff
changes
working on serverside code
another big serverside code commit.

things seem to be working now!! ...finally
sql stuff
gitignore update
cleanup
fix
initial GCM work done. lots of figuring out to do on what's what however.

still working on exactly how to send / receive the JSON data that I want
currently afraid of my code
more
data is being sent to the server...

...i think
done for the night
added ability to remove a user from the database
styling update for website
website style updates and backend work
favicon added to the website
Merge branch 'aws'

Conflicts:
	projects/android/classygames/src/edu/selu/android/classygames/GamesListActivity.java
	projects/android/classygames/src/edu/selu/android/classygames/NewGameActivity.java

	deleted:    documents/AWS_ElasticBeanstalk_DeveloperGuide.pdf
	deleted:    documents/AWS_ElasticComputeCloud_User_Guide.pdf
	new file:   links/AWS Documentation.url
	new file:   links/AWS SDK for Java - A Java Library for Amazon S3, Amazon EC2, and more..url
	new file:   links/AWS Service Health Dashboard.url
	new file:   links/json-simple - JSON.simple - A simple Java toolkit for JSON - Google Project Hosting.url
	new file:   misc/pngcrush.exe
	modified:   projects/android/classygames/AndroidManifest.xml
	new file:   projects/android/classygames/libs/gcm.jar
	new file:   projects/android/classygames/res/layout/amazon_activity.xml
	new file:   projects/android/classygames/res/menu/amazon_activity.xml
	modified:   projects/android/classygames/res/values/strings.xml
	new file:   projects/android/classygames/src/edu/selu/android/classygames/.gitignore
	new file:   projects/android/classygames/src/edu/selu/android/classygames/AmazonActivity.java
	modified:   projects/android/classygames/src/edu/selu/android/classygames/ConfirmGameActivity.java
	new file:   projects/android/classygames/src/edu/selu/android/classygames/GCMIntentService.java
	modified:   projects/android/classygames/src/edu/selu/android/classygames/GamesListActivity.java
	modified:   projects/android/classygames/src/edu/selu/android/classygames/MainActivity.java
	modified:   projects/android/classygames/src/edu/selu/android/classygames/NewGameActivity.java
	modified:   projects/android/classygames/src/edu/selu/android/classygames/Utilities.java
	new file:   projects/server/classygamesserver/WebContent/META-INF/MANIFEST.MF
	new file:   projects/server/classygamesserver/WebContent/WEB-INF/lib/gcm-server.jar
	new file:   projects/server/classygamesserver/WebContent/WEB-INF/lib/json-simple-1.1.1.jar
	new file:   projects/server/classygamesserver/WebContent/WEB-INF/lib/mysql-connector-java-5.1.22-bin.jar
	new file:   projects/server/classygamesserver/WebContent/WEB-INF/web.xml
	new file:   projects/server/classygamesserver/WebContent/assets/css/main.css
	new file:   projects/server/classygamesserver/WebContent/assets/img/bg.png
	new file:   projects/server/classygamesserver/WebContent/assets/img/github.png
	new file:   projects/server/classygamesserver/WebContent/assets/img/logo.png
	new file:   projects/server/classygamesserver/WebContent/assets/img/playstore.png
	new file:   projects/server/classygamesserver/WebContent/assets/js/main.js
	new file:   projects/server/classygamesserver/WebContent/favicon.ico
	new file:   projects/server/classygamesserver/WebContent/index.jsp
	new file:   projects/server/classygamesserver/src/.gitignore
	new file:   projects/server/classygamesserver/src/edu/selu/android/classygames/GamesListRefresh.java
	new file:   projects/server/classygamesserver/src/edu/selu/android/classygames/NewGame.java
	new file:   projects/server/classygamesserver/src/edu/selu/android/classygames/NewMove.java
	new file:   projects/server/classygamesserver/src/edu/selu/android/classygames/NewRegId.java
	new file:   projects/server/classygamesserver/src/edu/selu/android/classygames/RemoveRegId.java
	new file:   projects/server/classygamesserver/src/edu/selu/android/classygames/Utilities.java
	new file:   projects/server/mysql/create_table_games.sql
	new file:   projects/server/mysql/create_table_users.sql
	new file:   projects/server/mysql/mysql_connect.sh
	new file:   projects/server/mysql/mysql_show.sh
	new file:   resources/icons/favicon/favicon-016.png
	new file:   resources/icons/favicon/favicon-064.png
	new file:   resources/icons/favicon/favicon-128.png
	new file:   resources/icons/favicon/favicon.ai
	new file:   resources/icons/favicon/favicon.ico
	new file:   resources/other/playstore/playstore.png
	new file:   resources/other/playstore/playstore.psd
	deleted:    misc/pngcrush.exe
	deleted:    projects/android/classygames/res/drawable-hdpi/facebook_placeholder.png
	deleted:    projects/android/classygames/res/drawable-ldpi/facebook_placeholder.png
	deleted:    projects/android/classygames/res/drawable-mdpi/facebook_placeholder.png
	deleted:    projects/android/classygames/res/drawable-xhdpi/facebook_placeholder.png
	deleted:    projects/android/classygames/res/drawable/facebook_placeholder.png
	modified:   projects/android/classygames/res/layout/games_list_activity_listview_item.xml
	modified:   projects/android/classygames/res/layout/games_list_activity_listview_their_turn.xml
	modified:   projects/android/classygames/res/layout/games_list_activity_listview_your_turn.xml
	modified:   projects/android/classygames/src/edu/selu/android/classygames/NewGameActivity.java
	modified:   projects/android/classygames/src/edu/selu/android/classygames/Utilities.java
	deleted:    projects/server/classygamesserver/build/classes/AwsCredentials.properties
	deleted:    resources/facebook/facebook_button-active.9.png
	deleted:    resources/facebook/facebook_button.9.png
	deleted:    resources/facebook/facebook_button.psd
	deleted:    resources/facebook/facebook_placeholder.png
	modified:   resources/icons/notification/notification.ai
	projects/android/classygames/res/drawable-hdpi/fb_placeholder.png
	projects/android/classygames/res/drawable-ldpi/fb_placeholder.png
	projects/android/classygames/res/drawable-mdpi/fb_placeholder.png
	projects/android/classygames/res/drawable-xhdpi/fb_placeholder.png
	resources/facebook/facebook_button/
	resources/facebook/fb_placeholder/
huge merge and commit

server side code now exists